From 9682481322edc73b9c8bf7c1cb5908a13850abba Mon Sep 17 00:00:00 2001 From: "bren@br260.wolfson.cam.ac.uk" Date: Tue, 5 Apr 2005 11:52:27 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.216 (42527bfbE6fG4PF5bHcEOOoxGik5sw) Trivial fixes. --- linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c | 3 +-- linux-2.6.11-xen-sparse/drivers/xen/console/console.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c index 5933725bf7..3c23e57ae6 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c @@ -627,8 +627,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req) (bio_add_page(bio, virt_to_page(MMAP_VADDR(pending_idx, i)), seg[i].nsec << 9, - seg[i].buf & ~PAGE_MASK) < - (seg[i].nsec << 9)) ) + seg[i].buf & ~PAGE_MASK) == 0) ) { bio = biolist[nbio++] = bio_alloc(GFP_KERNEL, nseg-i); if ( unlikely(bio == NULL) ) diff --git a/linux-2.6.11-xen-sparse/drivers/xen/console/console.c b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c index fb2d1169ab..f1f620640b 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c @@ -87,6 +87,8 @@ static int __init xencons_setup(char *str) n = simple_strtol( str+3, &q, 10 ); if ( q > (str + 3) ) xc_num = n; break; + default: + break; } return 1; -- 2.30.2